Change in openvpn[master]: Fix dco_win and multisocket interaction
A message that is not in the archive (sent off-list or not yet received): gerrit.1744182251000.I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
to review the following change.
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
---
M src/openvpn/multi_io.c
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/1
src/openvpn/multi_io.c +8 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,7 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 )dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +538,7 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, its_Giaan, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
This fixes the first issue, but then we crash on ASSERT(management); in multi_io_process_io().
Signature · 20 lines
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c Gerrit-Change-Number: 935 Gerrit-PatchSet: 1 Gerrit-Owner: its_Giaan <[email protected]...> Gerrit-Reviewer: flichtenheld <[email protected]...> Gerrit-Reviewer: plaisthos <[email protected]...> Gerrit-CC: openvpn-devel <[email protected]> Gerrit-CC: stipa <[email protected]...> Gerrit-Attention: plaisthos <[email protected]...> Gerrit-Attention: its_Giaan <[email protected]...> Gerrit-Attention: flichtenheld <[email protected]...> Gerrit-Comment-Date: Wed, 09 Apr 2025 10:44:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, its_Giaan, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Quoted 1 line
This fixes the first issue, but then we crash on ASSERT(management); in
multi_io_process_io().
I misclicked on "Resolved".
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 1
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: stipa <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 09 Apr 2025 10:44:54 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: stipa <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, its_Giaan, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
to look at the new patch set (#2).
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
---
M src/openvpn/forward.c
M src/openvpn/multi_io.c
2 files changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/2
src/openvpn/forward.c +5 -2
@@ -2072,9 +2072,12 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if (c->options.mode !=MODE_SERVER ) { -wait_signal (es, (void *)err_shift); +if (flags &IOW_WAIT_SIGNAL ) + { +wait_signal (es, (void *)err_shift); + } }if (flags &IOW_TO_LINK )
src/openvpn/multi_io.c +8 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,7 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 )dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +538,7 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: stipa <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 2: Code-Review-2
(1 comment)
Patchset:
PS2:
Marking this as -2 to make sure we improve the commit message once we have a complete fix.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-CC: stipa <[email protected]...>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Wed, 09 Apr 2025 15:19:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: its_Giaan, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 2: Code-Review-2
(1 comment)
Patchset:
PS2:
This has fixed two previous issues but now we are at next one:
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Wed, 09 Apr 2025 15:39:37 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: its_Giaan, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
to look at the new patch set (#3).
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
---
M src/openvpn/forward.c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 15 insertions(+), 8 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/3
src/openvpn/forward.c +5 -2
@@ -2072,9 +2072,12 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if (c->options.mode !=MODE_SERVER ) { -wait_signal (es, (void *)err_shift); +if (flags &IOW_WAIT_SIGNAL ) + { +wait_signal (es, (void *)err_shift); + } }if (flags &IOW_TO_LINK )
src/openvpn/mtcp.c +2 -1
@@ -181,7 +181,8 @@if (mi) { -if (defer ||mbuf_defined (mi->tcp_link_out_deferred)) +if ((defer && !proto_is_dgram (mi->context.c2.link_sockets[0 ]->info.proto)) + ||mbuf_defined (mi->tcp_link_out_deferred)) {/* save to queue */ struct buffer *buf = &mi->context.c2.to_link;
src/openvpn/multi_io.c +8 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,7 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 )dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +538,7 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 3
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: its_Giaan, plaisthos.
Hello flichtenheld, plaisthos, stipa,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
to look at the new patch set (#4).
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
The recent introduction of the multisocket support did not account for some Windows-specific DCO paths. This patch restores correct behavior on Windows.
Key changes:
- Add WIN32 guards around DCO-specifc code.
- Disable wait_signal() when running in
server mode, as it conflicts with the
event engine since Windows handles
signals as I/Os.
- Ensure correct socket handling for TCP
vs UDP.
Github: #720
---
M src/openvpn/forward.c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/4
src/openvpn/forward.c +1 -1
@@ -2072,7 +2072,7 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if ((c->options.mode !=MODE_SERVER ) && (flags &IOW_WAIT_SIGNAL )) {wait_signal (es, (void *)err_shift); }
src/openvpn/mtcp.c +2 -1
@@ -181,7 +181,8 @@if (mi) { -if (defer ||mbuf_defined (mi->tcp_link_out_deferred)) +if ((defer && !proto_is_dgram (mi->context.c2.link_sockets[0 ]->info.proto)) + ||mbuf_defined (mi->tcp_link_out_deferred)) {/* save to queue */ struct buffer *buf = &mi->context.c2.to_link;
src/openvpn/multi_io.c +10 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,8 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +539,8 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: its_Giaan, plaisthos.
stipa has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 4: Code-Review+2
(1 comment)
Patchset:
PS4:
I tested TCP tap, UDP tap and UDP dco server, works fine - a client was able to connect and reconnect.
We would certainly need a more comprehensive dco-win server test, but so far this is good to do.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Thu, 10 Apr 2025 16:20:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: its_Giaan, plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Patch Set 4: -Code-Review
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 4
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: its_Giaan <[email protected]...>
Gerrit-Comment-Date: Thu, 10 Apr 2025 16:50:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v4 1/1 Fix dco_win and multisocket interaction
In reply to a message not in the archiveFrom: Gianmarco De Gregori <[email protected]...>
The recent introduction of the multisocket support did not account for some Windows-specific DCO paths. This patch restores correct behavior on Windows.
Key changes:
- Add WIN32 guards around DCO-specifc code.
- Disable wait_signal() when running in
server mode, as it conflicts with the
event engine since Windows handles
signals as I/Os.
- Ensure correct socket handling for TCP
vs UDP.
Github: #720
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/935
This mail reflects revision 4 of this Change.
Acked-by according to Gerrit (reflected above):
Lev Stipakov <[email protected]...>
src/openvpn/forward.c +1 -1
@@ -2072,7 +2072,7 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if ((c->options.mode !=MODE_SERVER ) && (flags &IOW_WAIT_SIGNAL )) {wait_signal (es, (void *)err_shift); }
src/openvpn/mtcp.c +2 -1
@@ -181,7 +181,8 @@if (mi) { -if (defer ||mbuf_defined (mi->tcp_link_out_deferred)) +if ((defer && !proto_is_dgram (mi->context.c2.link_sockets[0 ]->info.proto)) + ||mbuf_defined (mi->tcp_link_out_deferred)) {/* save to queue */ struct buffer *buf = &mi->context.c2.to_link;
src/openvpn/multi_io.c +10 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,8 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +539,8 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
[Openvpn-devel] [PATCH applied] Re: Fix dco_win and multisocket interaction
Stared at the code for a bit, and fed this to the Linux DCO server testbed (excercising multisocket only lightly).
Some of the changes are really straightforward (like not calling socket_set_listen_persistent() for dco_win, where the socket lives in kernel space), or just not calling (windows-only) wait_signal() for servers where win-DCO needs different handling.
The change to multi_tcp_process_outgoing_link() feels wrong, though
- yes, "what we do there" should obviously not been done for a DGRAM packet, but why is the function then called in the first place? So I guess there are a few more acts coming in this multisocket/event drama...
Anyway, this does not really affect Linux/FreeBSD DCO, and testing says it's not breaking anything - and it fixes Win/Server DCO, so one step forward at a time.
Your patch has been applied to the master branch.
commit 831c585e96587e28d1390d165d89b4152ba03bd3
Author: Gianmarco De Gregori Date: Thu Apr 10 23:50:29 2025 +0200
Fix dco_win and multisocket interaction
Signed-off-by: Gianmarco De Gregori <[email protected]...>
Acked-by: Lev Stipakov <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31419.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#5) to the change originally created by its_Giaan. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by stipa
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
The recent introduction of the multisocket support did not account for some Windows-specific DCO paths. This patch restores correct behavior on Windows.
Key changes:
- Add WIN32 guards around DCO-specifc code.
- Disable wait_signal() when running in
server mode, as it conflicts with the
event engine since Windows handles
signals as I/Os.
- Ensure correct socket handling for TCP
vs UDP.
Github: closes openvpn/OpenVPN#720
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31419.html
---
M src/openvpn/forward.c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/35/935/5
src/openvpn/forward.c +1 -1
@@ -2072,7 +2072,7 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if ((c->options.mode !=MODE_SERVER ) && (flags &IOW_WAIT_SIGNAL )) {wait_signal (es, (void *)err_shift); }
src/openvpn/mtcp.c +2 -1
@@ -181,7 +181,8 @@if (mi) { -if (defer ||mbuf_defined (mi->tcp_link_out_deferred)) +if ((defer && !proto_is_dgram (mi->context.c2.link_sockets[0 ]->info.proto)) + ||mbuf_defined (mi->tcp_link_out_deferred)) {/* save to queue */ struct buffer *buf = &mi->context.c2.to_link;
src/openvpn/multi_io.c +10 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,8 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +539,8 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/935?usp=email )
Change subject: Fix dco_win and multisocket interaction
......................................................................
Fix dco_win and multisocket interaction
The recent introduction of the multisocket support did not account for some Windows-specific DCO paths. This patch restores correct behavior on Windows.
Key changes:
- Add WIN32 guards around DCO-specifc code.
- Disable wait_signal() when running in
server mode, as it conflicts with the
event engine since Windows handles
signals as I/Os.
- Ensure correct socket handling for TCP
vs UDP.
Github: closes openvpn/OpenVPN#720
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31419.html
---
M src/openvpn/forward.c
M src/openvpn/mtcp.c
M src/openvpn/multi_io.c
3 files changed, 13 insertions(+), 7 deletions(-)
src/openvpn/forward.c +1 -1
@@ -2072,7 +2072,7 @@/* * Calculate the flags based on the provided 'flags' argument. */ -if (flags &IOW_WAIT_SIGNAL ) +if ((c->options.mode !=MODE_SERVER ) && (flags &IOW_WAIT_SIGNAL )) {wait_signal (es, (void *)err_shift); }
src/openvpn/mtcp.c +2 -1
@@ -181,7 +181,8 @@if (mi) { -if (defer ||mbuf_defined (mi->tcp_link_out_deferred)) +if ((defer && !proto_is_dgram (mi->context.c2.link_sockets[0 ]->info.proto)) + ||mbuf_defined (mi->tcp_link_out_deferred)) {/* save to queue */ struct buffer *buf = &mi->context.c2.to_link;
src/openvpn/multi_io.c +10 -5
@@ -176,10 +176,13 @@int status, i;unsigned int *persistent = &m->multi_io->tun_rwflags; -for (i =0 ; i < m->top.c1.link_sockets_num; i++) +if (!tuntap_is_dco_win (m->top.c1.tuntap)) { -socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, - &m->top.c2.link_sockets[i]->ev_arg); +for (i =0 ; i < m->top.c1.link_sockets_num; i++) + { +socket_set_listen_persistent (m->top.c2.link_sockets[i], m->multi_io->es, + &m->top.c2.link_sockets[i]->ev_arg); + } }if (has_udp_in_local_list (&m->top.options))
@@ -202,7 +205,8 @@ }#endif tun_set (m->top.c1.tuntap, m->multi_io->es,EVENT_READ ,MULTI_IO_TUN , persistent); -#if defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))dco_event_set (&m->top.c1.tuntap->dco, m->multi_io->es,MULTI_IO_DCO );#endif
@@ -535,7 +539,8 @@multi_io_action (m, mi,TA_INITIAL , false); } } -#if defined(ENABLE_DCO ) && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD )) +#if defined(ENABLE_DCO ) \ + && (defined(TARGET_LINUX ) || defined(TARGET_FREEBSD ) || defined(TARGET_WIN32 ))/* incoming data on DCO? */ else if (e->arg == MULTI_IO_DCO) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/935?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I719b1aa2d2f4d63dc9c18d8e313fba339e3e4b0c
Gerrit-Change-Number: 935
Gerrit-PatchSet: 5
Gerrit-Owner: its_Giaan <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: stipa <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged